Merge
authorcl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sun, 4 Dec 2005 17:24:24 +0000 (18:24 +0100)
committercl349@firebug.cl.cam.ac.uk <cl349@firebug.cl.cam.ac.uk>
Sun, 4 Dec 2005 17:24:24 +0000 (18:24 +0100)

Trivial merge